Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 9 Jan 2010 16:27:11 +0000 (11:27 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 9 Jan 2010 16:27:11 +0000 (11:27 -0500)
commit7b48b919e45393bf4977436adb7cf9329ed85fcd
tree439cde4af083781ebc6634ed6076a26a648c81e8
parenta767f5129c9568f7cfb3caec4cf78e384e0ed854
parentfd3292de089ef15004fecbe0f4c89d43a359b87a
Merge from mainline.